From: Dan Winship <danw@gnome.org>
Date: Wed, 7 Sep 2011 16:23:43 +0000 (-0400)
Subject: panel: fix part of the panel-corner-highlighting hack
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~7701
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=f2f2898fe3622dced9a7dd4a5f1592569bf67f23;p=gnome-shell.git

panel: fix part of the panel-corner-highlighting hack

The underline highlights on the panel menu items normally have a 100ms
transition between highlighted and unhighlighted, but the panel corner
graphics can't do that, so we hacked the Activities button and user
menu to have no transition. But in gdm mode, the user menu isn't the
rightmost item any more. Fix this by modifying the CSS from the code
instead.

https://bugzilla.gnome.org/show_bug.cgi?id=651299
---

diff --git a/data/theme/gnome-shell.css b/data/theme/gnome-shell.css
index 83a6d0317..8d3580e0e 100644
--- a/data/theme/gnome-shell.css
+++ b/data/theme/gnome-shell.css
@@ -371,18 +371,6 @@ StTooltip StLabel {
     -boxpointer-gap: 4px
 }
 
-/* The rounded panel corners we draw don't
- * support transitions, so disable transitions
- * for the buttons at the left/right edges
- */
-#panelActivities {
-    transition-duration: 0;
-}
-
-#panelStatus {
-    transition-duration: 0;
-}
-
 #panelStatusMenu {
     spacing: 4px;
 }
diff --git a/js/ui/panel.js b/js/ui/panel.js
index b64a1b224..57db12532 100644
--- a/js/ui/panel.js
+++ b/js/ui/panel.js
@@ -782,8 +782,10 @@ PanelCorner.prototype = {
             button = this._findRightmostButton(this._box);
 
         if (button) {
-            if (this._button && this._buttonStyleChangedSignalId)
+            if (this._button && this._buttonStyleChangedSignalId) {
                 this._button.disconnect(this._buttonStyleChangedSignalId);
+                this._button.style = null;
+            }
 
             this._button = button;
 
@@ -801,6 +803,10 @@ PanelCorner.prototype = {
                     let pseudoClass = button.get_style_pseudo_class();
                     this.actor.set_style_pseudo_class(pseudoClass);
                 }));
+
+            // The corner doesn't support theme transitions, so override
+            // the .panel-button default
+            button.style = 'transition-duration: 0';
         }
     },